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.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.72 by root, Wed Jul 5 01:53:24 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
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 70 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 71 $self->grab_focus;
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 72 return unless $::CONN;
73
74 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76 73
74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
76
77 $x -= int 0.5 * $::MAP->w; 77 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $::MAP->h; 78 $y -= int 0.5 * $self->{sh};
79
80 $x += 1;
81 $y += 1;
82 79
83 $::CONN->lookat ($x, $y) 80 $::CONN->lookat ($x, $y)
84 if $::CONN; 81 if $::CONN;
85 82
86 } elsif ($ev->{button} == 2) { 83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
87 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89 89
90 $self->{motion} = sub { 90 $self->{motion} = sub {
91 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
95 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 97
98 $self->update; 98 $self->update;
99 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser…\t(F1)", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills…\t(F2)", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory…\t(F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells…\t(F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… \t(F5)", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [
110 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup"
112 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle }
114 ],
115 ],
116 )->popup ($ev);
100 } 117 }
101 118
102 1 119 1
103} 120}
104 121
105sub button_up { 122sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
107 124
108 delete $self->{motion}; 125 delete $self->{motion};
109 126
110 1 127 1
111} 128}
112 129
113sub mouse_motion { 130sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
115 132
116 if ($self->{motion}) { 133 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 134 $self->{motion}->($ev, $x, $y);
118 } else { 135 } else {
… …
122 1 139 1
123} 140}
124 141
125sub size_request { 142sub size_request {
126 ( 143 (
127 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
128 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
129 ) 146 )
130} 147}
131 148
132sub update { 149sub update {
133 my ($self) = @_; 150 my ($self) = @_;
… …
150 CFClient::SDLK_RIGHT, [3, "east"], 167 CFClient::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 168 CFClient::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 169 CFClient::SDLK_LEFT, [7, "west"],
153); 170);
154 171
155sub key_down { 172sub invoke_key_down {
156 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
157
158 return 0 unless $::CONN;
159 174
160 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
162 my $uni = $ev->{unicode}; 177 my $uni = $ev->{unicode};
163 178
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
180
181 if ($uni == ord "\t") {
182 $::PL_WINDOW->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
188 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility;
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (!$::CONN) {
206 return 0; # bindings further down need a valid connection
207
164 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
165 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
166 } elsif ($uni == ord ",") { 210 } elsif ($uni == ord ",") {
167 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
168 } elsif ($uni == ord " ") { 212 } elsif ($uni == ord " ") {
169 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
170 } elsif ($uni == ord ".") { 214 } elsif ($uni == ord ".") {
171 $::CONN->user_send ($self->{completer}{last_command}) 215 $::CONN->user_send ($self->{completer}{last_command})
172 if exists $self->{completer}{last_command}; 216 if exists $self->{completer}{last_command};
173 } elsif ($uni == ord "\t") { 217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
174 $::INV_WINDOW->toggle_visibility; 218 $::CONN->user_send ($_) for @$bind_cmd;
175 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
176 $::CONN->user_send ("rotateshoottype +"); 220 $::CONN->user_send ("rotateshoottype +");
177 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
178 $::CONN->user_send ("rotateshoottype -"); 222 $::CONN->user_send ("rotateshoottype -");
179 } elsif ($uni == ord '"') { 223 } elsif ($uni == ord '"') {
180 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
181 $self->{completer}->show; 225 $self->{completer}->show;
182 } elsif ($uni == ord "'") { 226 } elsif ($uni == ord "'") {
… …
193 $self->{ctrl}++; 237 $self->{ctrl}++;
194 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
195 } else { 239 } else {
196 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
197 } 241 }
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 $::CFG->{bindings}->{$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 (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
211 $::CONN->user_send ($_) for @$bind_cmd;
212 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
214 $self->{completer}->show; 244 $self->{completer}->show;
215 } else { 245 } else {
216 return 0; 246 return 0;
217 } 247 }
218 248
219 1 249 1
220} 250}
221 251
222sub key_up { 252sub invoke_key_up {
223 my ($self, $ev) = @_; 253 my ($self, $ev) = @_;
224 254
225 my $res = 0; 255 my $res = 0;
226 my $mod = $ev->{mod}; 256 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 257 my $sym = $ev->{sym};
… …
250 } 280 }
251 281
252 $res 282 $res
253} 283}
254 284
285sub set_magicmap {
286 my ($self, $w, $h, $x, $y, $data) = @_;
287
288 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
289 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
290
291 $self->{magicmap} = [$x, $y, $w, $h, $data];
292
293 $self->update;
294}
295
255sub draw { 296sub draw {
256 my ($self) = @_; 297 my ($self) = @_;
298
299 return unless $::MAP;
257 300
258 my $focused = $CFClient::UI::FOCUS == $self 301 my $focused = $CFClient::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 302 || $CFClient::UI::FOCUS == $self->{completer}{entry};
260 303
261 return 304 return
262 unless $::CONN && ($focused || !$::FAST); 305 unless $focused || !$::FAST;
263 306
264 if (delete $self->{need_update}) { 307 if (delete $self->{need_update}) {
308 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
309
310 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
311 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
312
313 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
314 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
315
316 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
317 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
318
319 if ($::CFG->{fow_enable}) {
320 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
321
322 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
323 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
324 glConvolutionFilter2D (
325 GL_CONVOLUTION_2D,
326 GL_ALPHA,
327 3, 3,
328 GL_ALPHA, GL_FLOAT,
329 (pack "f*", @{ $self->{smooth_matrix} }),
330 );
331 glEnable GL_CONVOLUTION_2D;
332 }
333
265 $self->{fow_texture} ||= glGenTexture; 334 $self->{fow_texture} = new CFClient::Texture
335 w => $w,
336 h => $h,
337 data => $data,
338 internalformat => GL_ALPHA,
339 format => GL_ALPHA;
340
341 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
342 } else {
343 delete $self->{fow_texture};
344 }
266 345
267 glNewList $self->{list}; 346 glNewList $self->{list};
268 347
269 if ($::MAP) {
270 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
271 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
272
273 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
274 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
275 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
276 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
277
278 glPushMatrix; 348 glPushMatrix;
349 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 351
281 glTranslate $sx0, $sy0; 352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
282 353
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 354 glScale 32, 32;
284 355
285 if ($::CFG->{fow_enable}) { 356 if (my $tex = $self->{fow_texture}) {
286 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
287 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
288 glConvolutionFilter2D (
289 GL_CONVOLUTION_2D,
290 GL_ALPHA,
291 3, 3,
292 GL_ALPHA, GL_FLOAT,
293 (pack "f*", @{ $self->{smooth_matrix} }),
294 );
295 glEnable GL_CONVOLUTION_2D;
296 }
297
298 $self->{fow_texture_name} ||= glGenTexture;
299 # try to re-use the texture name: TODO improve texture class instead
300
301 $self->{fow_texture} = new CFClient::Texture
302 w => $w,
303 h => $h,
304 data => $data,
305 name => $self->{fow_texture_name},
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310
311 glEnable GL_TEXTURE_2D; 357 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 359
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 361 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 362
317 glDisable GL_TEXTURE_2D; 363 glDisable GL_TEXTURE_2D;
318 } 364 }
319 365
366 if ($self->{magicmap}) {
367 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
368
369 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
370 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
371
372 glTranslate - $x - 1, - $y - 1;
373 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
374 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
375 }
376
320 glPopMatrix; 377 glPopMatrix;
321 }
322
323 glEndList; 378 glEndList;
324 } 379 }
325 380
326 glPushMatrix;
327 glCallList $self->{list}; 381 glCallList $self->{list};
328 glPopMatrix;
329 382
330 # TNT2 emulates logops in software (or worse :) 383 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 384 unless ($focused) {
332 (delete $self->{out_of_focus})->destroy
333 if $self->{out_of_focus};
334 } else {
335 glColor 0.4, 0.2, 0.2, 0.6; 385 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 386 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 387 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 388 glBegin GL_QUADS;
339 glVertex 0, 0; 389 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 390 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 391 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 392 glVertex $::WIDTH, 0;
343 glEnd; 393 glEnd;
344 glDisable GL_BLEND; 394 glDisable GL_BLEND;
345
346# $self->{out_of_focus} ||= do {
347# my $label = new CFClient::UI::Label
348# x => 0,
349# y => 0,
350# z => 1,
351# ellipsise => 0,
352# text => "map out of focus (click map to play)";
353#
354# $label->show;
355# $label->update;
356#
357# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
358# $label->move_abs (
359# ($::WIDTH - $label->{w}) * 0.5,
360# ($::HEIGHT - $label->{h}) * 0.5,
361# );
362# });
363#
364# $label
365# };
366 } 395 }
367} 396}
368 397
369sub DESTROY { 398sub DESTROY {
370 my $self = shift; 399 my $self = shift;
… …
383 412
384sub size_request { 413sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 415}
387 416
388sub size_allocate { 417sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
390 419
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 420 $self->update;
421
422 1
393} 423}
394 424
395sub update { 425sub update {
396 my ($self) = @_; 426 my ($self) = @_;
397 427
… …
482 ]; 512 ];
483 513
484 $self->{entry} = new CFClient::UI::Entry 514 $self->{entry} = new CFClient::UI::Entry
485 on_changed => sub { 515 on_changed => sub {
486 $self->update_labels; 516 $self->update_labels;
517 0
487 }, 518 },
488 on_button_down => sub { 519 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 520 my ($entry, $ev, $x, $y) = @_;
490 521
491 if ($ev->{button} == 3) { 522 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 523 (new CFClient::UI::Menu
493 items => [ 524 items => [
525 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
494 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 526 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
495 ], 527 ],
496 )->popup ($ev); 528 )->popup ($ev);
497 return 1; 529 return 1;
498 } 530 }
499 0 531 0
… …
506 if ($ev->{sym} == 13) { 538 if ($ev->{sym} == 13) {
507 if (exists $self->{select}) { 539 if (exists $self->{select}) {
508 $self->{last_command} = $self->{select}; 540 $self->{last_command} = $self->{select};
509 $::CONN->user_send ($self->{select}); 541 $::CONN->user_send ($self->{select});
510 542
511 unshift @{$self->{history}}, $self->{select}; 543 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0; 544 $self->{hist_ptr} = 0;
513 545
514 $self->hide; 546 $self->hide;
515 } 547 }
516 } elsif ($ev->{sym} == 27) { 548 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0; 549 $self->{hist_ptr} = 0;
518 $self->hide; 550 $self->hide;
519 return;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 552 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 553 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 555 } elsif ($self->{hist_ptr} > 0) {
… …
564 595
565 $self->{entry}->set_text ($prefix); 596 $self->{entry}->set_text ($prefix);
566 $self->show; 597 $self->show;
567} 598}
568 599
569sub size_allocate { 600sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
571 602
572 $self->SUPER::size_allocate ($w, $h);
573 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 603 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
604
605 $self->SUPER::invoke_size_allocate ($w, $h)
574} 606}
575 607
576sub show { 608sub show {
577 my ($self) = @_; 609 my ($self) = @_;
578 610
579 $self->SUPER::show; 611 $self->SUPER::show;
580 $self->{entry}->focus_in; 612 $self->{entry}->grab_focus;
581} 613}
582 614
583sub hide { 615sub hide {
584 my ($self) = @_; 616 my ($self) = @_;
585 617
586 $self->SUPER::hide; 618 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 619 $self->{entry}->set_text ("");
588} 620}
589 621
590sub key_down { 622sub invoke_key_down {
591 my ($self, $ev) = @_; 623 my ($self, $ev) = @_;
592 624
593 $self->{entry}->key_down ($ev) 625 $self->{entry}->emit (key_down => $ev)
594} 626}
595 627
596sub update_labels { 628sub update_labels {
597 my ($self) = @_; 629 my ($self) = @_;
598 630
… …
685 $label->set_text (""); 717 $label->set_text ("");
686 $label->set_tooltip (""); 718 $label->set_tooltip ("");
687 } 719 }
688 720
689 $self->update; 721 $self->update;
690 ###
691} 722}
692 723
693sub _draw { 724sub _draw {
694 my ($self) = @_; 725 my ($self) = @_;
695 726

Diff Legend

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