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

Diff Legend

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