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

Diff Legend

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