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

Diff Legend

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