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.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.69 by root, Mon Jun 26 21:59:04 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
… …
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 50 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 51
41 (my $data = $command) =~ s/\\//g; 52 (my $data = $command) =~ s/\\//g;
42 53
43 $tooltip =~ s/^\s+//; 54 $tooltip =~ s/^\s+//;
44
45 $tooltip = "<big>$data</big>\n\n$tooltip"; 55 $tooltip = "<big>$data</big>\n\n$tooltip";
46
47 $tooltip =~ s/\s+$//; 56 $tooltip =~ s/\s+$//;
48 57
49 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 58 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
50} 59}
51 60
… …
53 my ($self) = @_; 62 my ($self) = @_;
54 63
55 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
56} 65}
57 66
58sub button_down { 67sub invoke_button_down {
59 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
60 69
70 return unless $::CONN;
71
61 $self->focus_in; 72 $self->grab_focus;
62 73
63 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) {
64 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
65 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
66 87
67 $self->{motion} = sub { 88 $self->{motion} = sub {
68 my ($ev, $x, $y) = @_; 89 my ($ev, $x, $y) = @_;
… …
73 $::CFG->{map_shift_y} = $bh + $y - $oy; 94 $::CFG->{map_shift_y} = $bh + $y - $oy;
74 95
75 $self->update; 96 $self->update;
76 }; 97 };
77 } 98 }
78}
79 99
100 1
101}
102
80sub button_up { 103sub invoke_button_up {
81 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
82 105
83 delete $self->{motion}; 106 delete $self->{motion};
84}
85 107
108 1
109}
110
86sub mouse_motion { 111sub invoke_mouse_motion {
87 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
88 113
114 if ($self->{motion}) {
89 $self->{motion}->($ev, $x, $y) if $self->{motion}; 115 $self->{motion}->($ev, $x, $y);
116 } else {
117 return 0;
118 }
119
120 1
90} 121}
91 122
92sub size_request { 123sub size_request {
93 ( 124 (
94 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
95 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
96 ) 127 )
97} 128}
98 129
99sub update { 130sub update {
100 my ($self) = @_; 131 my ($self) = @_;
… …
117 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
118 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
119 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
120); 151);
121 152
122sub key_down { 153sub invoke_key_down {
123 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
124 155
125 return unless $::CONN; 156 return 0 unless $::CONN;
126 157
127 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
128 my $sym = $ev->{sym}; 159 my $sym = $ev->{sym};
129 my $uni = $ev->{unicode}; 160 my $uni = $ev->{unicode};
130 161
… …
136 $::CONN->user_send ("apply"); 167 $::CONN->user_send ("apply");
137 } elsif ($uni == ord ".") { 168 } elsif ($uni == ord ".") {
138 $::CONN->user_send ($self->{completer}{last_command}) 169 $::CONN->user_send ($self->{completer}{last_command})
139 if exists $self->{completer}{last_command}; 170 if exists $self->{completer}{last_command};
140 } elsif ($uni == ord "\t") { 171 } elsif ($uni == ord "\t") {
141 # TODO: toggle inventory 172 $::INV_WINDOW->toggle_visibility;
142 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
143 $::CONN->user_send ("rotateshoottype +"); 174 $::CONN->user_send ("rotateshoottype +");
144 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
145 $::CONN->user_send ("rotateshoottype -"); 176 $::CONN->user_send ("rotateshoottype -");
146 } elsif ($uni == ord '"') { 177 } elsif ($uni == ord '"') {
… …
150 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
151 $self->{completer}->show; 182 $self->{completer}->show;
152 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
153 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
154 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
155 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
156 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
157 $self->{ctrl}++; 191 $self->{ctrl}++;
158 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
159 } else { 193 } else {
160 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
161 } 195 }
162 } elsif ($ev->{unicode}) { 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 $::BIND_EDITOR->cfg_bind ($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->{profile}{default}{bindings}{$mod}{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
163 $self->{completer}->key_down ($ev); 211 $self->{completer}->invoke_key_down ($ev);
164 $self->{completer}->show; 212 $self->{completer}->show;
213 } else {
214 return 0;
215 }
216
165 } 217 1
166} 218}
167 219
168sub key_up { 220sub invoke_key_up {
169 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
170 222
223 my $res = 0;
171 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
172 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
173 226
227 if ($::CFG->{shift_fire_stop}) {
174 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
175 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
231 $res = 1;
232 }
233 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir};
237 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir};
241 $res = 1;
242 }
176 } 243 }
244
177 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
178 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
247 $res = 1;
179 } 248 }
249
250 $res
251}
252
253sub set_magicmap {
254 my ($self, $w, $h, $x, $y, $data) = @_;
255
256 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
257 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
258
259 $self->{magicmap} = [$x, $y, $w, $h, $data];
260
261 $self->update;
180} 262}
181 263
182sub draw { 264sub draw {
183 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
184 268
185 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
186 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
187 271
188 return 272 return
189 unless $focused || !$::FAST; 273 unless $focused || !$::FAST;
190 274
191 if (delete $self->{need_update}) { 275 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
280
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
286
287 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D,
294 GL_ALPHA,
295 3, 3,
296 GL_ALPHA, GL_FLOAT,
297 (pack "f*", @{ $self->{smooth_matrix} }),
298 );
299 glEnable GL_CONVOLUTION_2D;
300 }
301
302 $self->{fow_texture} = new CFClient::Texture
303 w => $w,
304 h => $h,
305 data => $data,
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310 } else {
311 delete $self->{fow_texture};
312 }
313
192 glNewList $self->{list}; 314 glNewList $self->{list};
193 315
194 if ($::MAP) {
195 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
196 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
197
198 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
199 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
200
201 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
202 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
203 319
204 glTranslate $sx0 - 32, $sy0 - 32, 0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
205 321
206 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
207 323
208 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
209 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
210 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
211 glConvolutionFilter2D (
212 GL_CONVOLUTION_2D,
213 GL_ALPHA,
214 3, 3,
215 GL_ALPHA, GL_FLOAT,
216 pack "f*",
217 0.05, 0.13, 0.05,
218 0.13, 0.30, 0.13,
219 0.05, 0.13, 0.05,
220 );
221 glEnable GL_CONVOLUTION_2D;
222 }
223
224 $self->{fow_texture_name} ||= glGenTexture;
225 # try to re-use the texture name: TODO improve texture class instead
226
227 $self->{fow_texture} = new CFClient::Texture
228 w => $w,
229 h => $h,
230 data => $data,
231 name => $self->{fow_texture_name},
232 internalformat => GL_ALPHA,
233 format => GL_ALPHA;
234
235 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
236
237 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
239 327
240 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
241 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
242 330
243 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
244 } 332 }
245 333
334 if ($self->{magicmap}) {
335 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336
337 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339
340 glTranslate - $x - 1, - $y - 1;
341 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343 }
344
246 glPopMatrix; 345 glPopMatrix;
247 }
248
249 glEndList; 346 glEndList;
250 } 347 }
251 348
252 glPushMatrix;
253 glCallList $self->{list}; 349 glCallList $self->{list};
254 glPopMatrix;
255 350
256 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
257 if ($focused) { 352 unless ($focused) {
258 (delete $self->{out_of_focus})->destroy
259 if $self->{out_of_focus};
260 } else {
261 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
262 glEnable GL_BLEND; 354 glEnable GL_BLEND;
263 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
264 glBegin GL_QUADS; 356 glBegin GL_QUADS;
265 glVertex 0, 0; 357 glVertex 0, 0;
266 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
267 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
268 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
269 glEnd; 361 glEnd;
270 glDisable GL_BLEND; 362 glDisable GL_BLEND;
271
272# $self->{out_of_focus} ||= do {
273# my $label = new CFClient::UI::Label
274# x => 0,
275# y => 0,
276# z => 1,
277# ellipsise => 0,
278# text => "map out of focus (click map to play)";
279#
280# $label->show;
281# $label->update;
282#
283# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
284# $label->move (
285# ($::WIDTH - $label->{w}) * 0.5,
286# ($::HEIGHT - $label->{h}) * 0.5,
287# );
288# });
289#
290# $label
291# };
292 } 363 }
293} 364}
294 365
295sub DESTROY { 366sub DESTROY {
296 my $self = shift; 367 my $self = shift;
… …
309 380
310sub size_request { 381sub size_request {
311 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
312} 383}
313 384
314sub size_allocate { 385sub invoke_size_allocate {
315 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
316 387
317 $self->SUPER::size_allocate ($w, $h);
318 $self->update; 388 $self->update;
389
390 1
319} 391}
320 392
321sub update { 393sub update {
322 my ($self) = @_; 394 my ($self) = @_;
323 395
… …
406 fontsize => $_, 478 fontsize => $_,
407 ), (0.8) x 16 479 ), (0.8) x 16
408 ]; 480 ];
409 481
410 $self->{entry} = new CFClient::UI::Entry 482 $self->{entry} = new CFClient::UI::Entry
411 connect_changed => sub { 483 on_changed => sub {
412 $self->update_labels; 484 $self->update_labels;
485 0
413 }, 486 },
487 on_button_down => sub {
488 my ($entry, $ev, $x, $y) = @_;
489
490 if ($ev->{button} == 3) {
491 (new CFClient::UI::Menu
492 items => [
493 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
494 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
495 ],
496 )->popup ($ev);
497 return 1;
498 }
499 0
500 },
414 connect_key_down => sub { 501 on_key_down => sub {
415 my ($entry, $ev) = @_; 502 my ($entry, $ev) = @_;
416 503
417 my $self = $entry->{parent}{parent}; 504 my $self = $entry->{parent}{parent};
418 505
419 if ($ev->{sym} == 13) { 506 if ($ev->{sym} == 13) {
420 if (exists $self->{select}) { 507 if (exists $self->{select}) {
421 $self->{last_command} = $self->{select}; 508 $self->{last_command} = $self->{select};
422 $::CONN->user_send ($self->{select}); 509 $::CONN->user_send ($self->{select});
510
511 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0;
513
423 $self->hide; 514 $self->hide;
424 } 515 }
425 } elsif ($ev->{sym} == 27) { 516 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0;
426 $self->hide; 518 $self->hide;
427 return;
428 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 519 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
520 if ($self->{hist_ptr} > 1) {
521 $self->{hist_ptr}--;
522 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
523 } elsif ($self->{hist_ptr} > 0) {
524 $self->{hist_ptr}--;
525 $self->{entry}->set_text ($self->{hist_saveback});
526 } else {
429 ++$self->{select_offset} 527 ++$self->{select_offset}
430 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 528 if $self->{select_offset} < $#{ $self->{last_match} || [] };
529 }
431 $self->update_labels; 530 $self->update_labels;
432 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 531 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
532 if ($self->{select_offset}) {
433 --$self->{select_offset} 533 --$self->{select_offset}
534 } else {
535 unless ($self->{hist_ptr}) {
536 $self->{hist_saveback} = $self->{entry}->get_text;
537 }
538 if ($self->{hist_ptr} <= $#{$self->{history}}) {
434 if $self->{select_offset}; 539 $self->{hist_ptr}++;
540 }
541 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
542 if exists $self->{history}->[$self->{hist_ptr} - 1];
543 }
435 $self->update_labels; 544 $self->update_labels;
436 } else { 545 } else {
437 return 0; 546 return 0;
438 } 547 }
439 548
… …
454 563
455 $self->{entry}->set_text ($prefix); 564 $self->{entry}->set_text ($prefix);
456 $self->show; 565 $self->show;
457} 566}
458 567
459sub size_allocate { 568sub invoke_size_allocate {
460 my ($self, $w, $h) = @_; 569 my ($self, $w, $h) = @_;
461 570
462 $self->SUPER::size_allocate ($w, $h);
463 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 571 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
572
573 $self->SUPER::invoke_size_allocate ($w, $h)
464} 574}
465 575
466sub show { 576sub show {
467 my ($self) = @_; 577 my ($self) = @_;
468 578
469 $self->SUPER::show; 579 $self->SUPER::show;
470 $self->{entry}->focus_in; 580 $self->{entry}->grab_focus;
471} 581}
472 582
473sub hide { 583sub hide {
474 my ($self) = @_; 584 my ($self) = @_;
475 585
476 $self->SUPER::hide; 586 $self->SUPER::hide;
477 $self->{entry}->set_text (""); 587 $self->{entry}->set_text ("");
478} 588}
479 589
480sub key_down { 590sub invoke_key_down {
481 my ($self, $ev) = @_; 591 my ($self, $ev) = @_;
482 592
483 $self->{entry}->key_down ($ev); 593 $self->{entry}->emit (key_down => $ev)
484} 594}
485 595
486sub update_labels { 596sub update_labels {
487 my ($self) = @_; 597 my ($self) = @_;
488 598
… …
521 631
522 @match = map $self->{command}{$_->[0]}, 632 @match = map $self->{command}{$_->[0]},
523 sort { 633 sort {
524 $a->[1] <=> $b->[1] 634 $a->[1] <=> $b->[1]
525 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 635 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
526 or (length $a->[0]) <=> (length $b->[0]) 636 or (length $b->[0]) <=> (length $a->[0])
527 } @match; 637 } @match;
528 } 638 }
529 639
530 $self->{last_search} = $cmd; 640 $self->{last_search} = $text;
531 $self->{last_match} = \@match; 641 $self->{last_match} = \@match;
532 642
533 $self->{select_offset} = 0; 643 $self->{select_offset} = 0;
534 } 644 }
535 645
… …
575 $label->set_text (""); 685 $label->set_text ("");
576 $label->set_tooltip (""); 686 $label->set_tooltip ("");
577 } 687 }
578 688
579 $self->update; 689 $self->update;
580 ###
581} 690}
582 691
583sub _draw { 692sub _draw {
584 my ($self) = @_; 693 my ($self) = @_;
585 694

Diff Legend

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