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.20 by root, Tue Apr 25 14:04:37 2006 UTC vs.
Revision 1.47 by root, Fri Jun 2 22:13:47 2006 UTC

… …
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ); 20 );
21 21
22 $self->add_command ("killpets", "kills all your summoned and charmed creates"); 22 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "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"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ;
23 34
24 $self 35 $self
25} 36}
26 37
27sub DESTROY { 38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40
41 (my $data = $command) =~ s/\\//g;
42
43 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//;
46
47 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48}
49
50sub clr_commands {
28 my $self = shift; 51 my ($self) = @_;
29 52
30 glDeleteList $self->{list}; 53 %{$self->{completer}{command}} = ();
31
32 $self->SUPER::DESTROY;
33} 54}
34 55
35sub button_down { 56sub button_down {
36 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
37 58
… …
50 $::CFG->{map_shift_y} = $bh + $y - $oy; 71 $::CFG->{map_shift_y} = $bh + $y - $oy;
51 72
52 $self->update; 73 $self->update;
53 }; 74 };
54 } 75 }
76
77 1
55} 78}
56 79
57sub button_up { 80sub button_up {
58 my ($self, $ev, $x, $y) = @_; 81 my ($self, $ev, $x, $y) = @_;
59 82
60 delete $self->{motion}; 83 delete $self->{motion};
84
85 1
61} 86}
62 87
63sub mouse_motion { 88sub mouse_motion {
64 my ($self, $ev, $x, $y) = @_; 89 my ($self, $ev, $x, $y) = @_;
65 90
91 if ($self->{motion}) {
66 $self->{motion}->($ev, $x, $y) if $self->{motion}; 92 $self->{motion}->($ev, $x, $y);
93 } else {
94 return 0;
95 }
96
97 1
67} 98}
68 99
69sub size_request { 100sub size_request {
70 ( 101 (
71 1 + 32 * int $::WIDTH / 32, 102 1 + 32 * int $::WIDTH / 32,
… …
78 109
79 $self->{need_update} = 1; 110 $self->{need_update} = 1;
80 $self->SUPER::update; 111 $self->SUPER::update;
81} 112}
82 113
114my %DIR = (
115 CFClient::SDLK_KP8, [1, "north"],
116 CFClient::SDLK_KP9, [2, "northeast"],
117 CFClient::SDLK_KP6, [3, "east"],
118 CFClient::SDLK_KP3, [4, "southeast"],
119 CFClient::SDLK_KP2, [5, "south"],
120 CFClient::SDLK_KP1, [6, "southwest"],
121 CFClient::SDLK_KP4, [7, "west"],
122 CFClient::SDLK_KP7, [8, "northwest"],
123
124 CFClient::SDLK_UP, [1, "north"],
125 CFClient::SDLK_RIGHT, [3, "east"],
126 CFClient::SDLK_DOWN, [5, "south"],
127 CFClient::SDLK_LEFT, [7, "west"],
128);
129
130sub key_down {
131 my ($self, $ev) = @_;
132
133 return 0 unless $::CONN;
134
135 my $mod = $ev->{mod};
136 my $sym = $ev->{sym};
137 my $uni = $ev->{unicode};
138
139 if ($sym == CFClient::SDLK_KP5) {
140 $::CONN->user_send ("stay fire");
141 } elsif ($uni == ord ",") {
142 $::CONN->user_send ("take");
143 } elsif ($uni == ord " ") {
144 $::CONN->user_send ("apply");
145 } elsif ($uni == ord ".") {
146 $::CONN->user_send ($self->{completer}{last_command})
147 if exists $self->{completer}{last_command};
148 } elsif ($uni == ord "\t") {
149 $::INV_WINDOW->toggle_visibility;
150 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
151 $::CONN->user_send ("rotateshoottype +");
152 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
153 $::CONN->user_send ("rotateshoottype -");
154 } elsif ($uni == ord '"') {
155 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
156 $self->{completer}->show;
157 } elsif ($uni == ord "'") {
158 $self->{completer}->set_prefix ("");
159 $self->{completer}->show;
160 } elsif (exists $DIR{$sym}) {
161 if ($mod & CFClient::KMOD_SHIFT) {
162 $self->{shft}++;
163 $::CONN->user_send ("fire $DIR{$sym}[0]");
164 } elsif ($mod & CFClient::KMOD_CTRL) {
165 $self->{ctrl}++;
166 $::CONN->user_send ("run $DIR{$sym}[0]");
167 } else {
168 $::CONN->user_send ("$DIR{$sym}[1]");
169 }
170 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
171 $::BIND_EDITOR->set_binding (undef, undef, [],
172 sub {
173 my ($mod, $sym, $cmds) = @_;
174 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
175 });
176 $::BIND_EDITOR->start;
177 $::BIND_EDITOR->show;
178 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
179 $::BIND_EDITOR->stop;
180 $::BIND_EDITOR->ask_for_bind_and_commit;
181 $::BIND_EDITOR->hide;
182 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
183 $::CONN->user_send ($_) for @$bind_cmd;
184 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
185 $self->{completer}->key_down ($ev);
186 $self->{completer}->show;
187 } else {
188 return 0;
189 }
190
191 1
192}
193
194sub key_up {
195 my ($self, $ev) = @_;
196
197 my $res = 0;
198 my $mod = $ev->{mod};
199 my $sym = $ev->{sym};
200
201 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
202 $::CONN->user_send ("fire_stop");
203 $res = 1;
204 }
205
206 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
207 $::CONN->user_send ("run_stop");
208 $res = 1;
209 }
210
211 $res
212}
213
83sub draw { 214sub draw {
84 my ($self) = @_; 215 my ($self) = @_;
216
217 my $focused = $CFClient::UI::FOCUS == $self
218 || $CFClient::UI::FOCUS == $self->{completer}{entry};
219
220 return
221 unless $focused || !$::FAST;
85 222
86 if (delete $self->{need_update}) { 223 if (delete $self->{need_update}) {
87 glNewList $self->{list}; 224 glNewList $self->{list};
88 225
89 if ($::MAP) { 226 if ($::MAP) {
… …
99 glTranslate $sx0 - 32, $sy0 - 32, 0; 236 glTranslate $sx0 - 32, $sy0 - 32, 0;
100 237
101 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 238 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
102 239
103 if ($::CFG->{fow_enable}) { 240 if ($::CFG->{fow_enable}) {
104 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 241 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
105 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 242 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
106 glConvolutionFilter2D ( 243 glConvolutionFilter2D (
107 GL_CONVOLUTION_2D, 244 GL_CONVOLUTION_2D,
108 GL_ALPHA, 245 GL_ALPHA,
109 3, 3, 246 3, 3,
… …
114 0.05, 0.13, 0.05, 251 0.05, 0.13, 0.05,
115 ); 252 );
116 glEnable GL_CONVOLUTION_2D; 253 glEnable GL_CONVOLUTION_2D;
117 } 254 }
118 255
256 $self->{fow_texture_name} ||= glGenTexture;
257 # try to re-use the texture name: TODO improve texture class instead
258
119 $self->{fow_texture} = new CFClient::Texture 259 $self->{fow_texture} = new CFClient::Texture
120 w => $w, 260 w => $w,
121 h => $h, 261 h => $h,
122 data => $data, 262 data => $data,
263 name => $self->{fow_texture_name},
123 internalformat => GL_ALPHA, 264 internalformat => GL_ALPHA,
124 format => GL_ALPHA; 265 format => GL_ALPHA;
125 266
126 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 267 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
127 268
128 glEnable GL_BLEND;
129 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
130 glEnable GL_TEXTURE_2D; 269 glEnable GL_TEXTURE_2D;
131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
132 271
133 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 272 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
134 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 273 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
135 274
136 glDisable GL_TEXTURE_2D; 275 glDisable GL_TEXTURE_2D;
137 glDisable GL_BLEND;
138 } 276 }
139 277
140 glPopMatrix; 278 glPopMatrix;
141 } 279 }
142 280
… …
145 283
146 glPushMatrix; 284 glPushMatrix;
147 glCallList $self->{list}; 285 glCallList $self->{list};
148 glPopMatrix; 286 glPopMatrix;
149 287
150 if ($CFClient::UI::FOCUS != $self) { 288 # TNT2 emulates logops in software (or worse :)
151 glColor 64/255, 64/255, 64/255; 289 if ($focused) {
152 glLogicOp GL_AND; 290 (delete $self->{out_of_focus})->destroy
153 glEnable GL_COLOR_LOGIC_OP; 291 if $self->{out_of_focus};
292 } else {
293 glColor 0.4, 0.2, 0.2, 0.6;
294 glEnable GL_BLEND;
295 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 296 glBegin GL_QUADS;
155 glVertex 0, 0; 297 glVertex 0, 0;
156 glVertex 0, $::HEIGHT; 298 glVertex 0, $::HEIGHT;
157 glVertex $::WIDTH, $::HEIGHT; 299 glVertex $::WIDTH, $::HEIGHT;
158 glVertex $::WIDTH, 0; 300 glVertex $::WIDTH, 0;
159 glEnd; 301 glEnd;
160 glDisable GL_COLOR_LOGIC_OP; 302 glDisable GL_BLEND;
161 }
162}
163 303
164my %DIR = ( 304# $self->{out_of_focus} ||= do {
165 CFClient::SDLK_KP8, [1, "north"], 305# my $label = new CFClient::UI::Label
166 CFClient::SDLK_KP9, [2, "northeast"], 306# x => 0,
167 CFClient::SDLK_KP6, [3, "east"], 307# y => 0,
168 CFClient::SDLK_KP3, [4, "southeast"], 308# z => 1,
169 CFClient::SDLK_KP2, [5, "south"], 309# ellipsise => 0,
170 CFClient::SDLK_KP1, [6, "southwest"], 310# text => "map out of focus (click map to play)";
171 CFClient::SDLK_KP4, [7, "west"], 311#
172 CFClient::SDLK_KP7, [8, "northwest"], 312# $label->show;
173 313# $label->update;
174 CFClient::SDLK_UP, [1, "north"], 314#
175 CFClient::SDLK_RIGHT, [3, "east"], 315# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
176 CFClient::SDLK_DOWN, [5, "south"], 316# $label->move_abs (
177 CFClient::SDLK_LEFT, [7, "west"], 317# ($::WIDTH - $label->{w}) * 0.5,
178); 318# ($::HEIGHT - $label->{h}) * 0.5,
179 319# );
180sub key_down { 320# });
181 my ($self, $ev) = @_; 321#
182 322# $label
183 my $mod = $ev->{mod};
184 my $sym = $ev->{sym};
185
186 if ($sym == CFClient::SDLK_KP5) {
187 $::CONN->user_send ("stay fire");
188 } elsif ($sym == ord ",") {
189 $::CONN->user_send ("take");
190 } elsif ($sym == ord "a") {
191 $::CONN->user_send ("apply");
192 } elsif ($sym == ord "'") {
193 $self->emit ('activate_console');
194 } elsif ($sym == ord "/") {
195 $self->emit (activate_console => '/');
196 } elsif (exists $DIR{$sym}) {
197 if ($mod & CFClient::KMOD_SHIFT) {
198 $self->{shft}++;
199 $::CONN->user_send ("fire $DIR{$sym}[0]");
200 } elsif ($mod & CFClient::KMOD_CTRL) {
201 $self->{ctrl}++;
202 $::CONN->user_send ("run $DIR{$sym}[0]");
203 } else {
204 $::CONN->user_send ("$DIR{$sym}[1]");
205 } 323# };
206 } elsif ($ev->{unicode}) {
207 $self->{command_widget} ||=
208 new CFClient::MapWidget::Command::
209 command => $self->{command},
210 can_focus => 1,
211 connect_execute => sub {
212 # todo: support callback instead of user_send
213 $::CONN->user_send ($_[1][1]);
214 },
215 connect_close => sub {
216 (delete $self->{command_widget})->hide;
217 $self->focus_in;
218 },
219 ;
220 $self->{command_widget}->key_down ($ev);
221 return unless $self->{command_widget};
222 $self->{command_widget}->show;
223 $self->{command_widget}->focus_in;
224 } 324 }
225} 325}
226 326
227sub key_up { 327sub DESTROY {
228 my ($self, $ev) = @_; 328 my $self = shift;
229 329
230 my $mod = $ev->{mod}; 330 glDeleteList $self->{list};
231 my $sym = $ev->{sym};
232 331
233 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 332 $self->SUPER::DESTROY;
234 $::CONN->user_send ("fire_stop");
235 }
236 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
237 $::CONN->user_send ("run_stop");
238 }
239}
240
241sub add_command {
242 my ($self, $command, $tooltip, $widget, $cb) = @_;
243
244 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
245
246 $self->{command} = [
247 [$abbrev, $command, $tooltip, $widget, $cb],
248 grep $_->[1] ne $command, @{ $self->{command} },
249 ];
250} 333}
251 334
252package CFClient::MapWidget::MapMap; 335package CFClient::MapWidget::MapMap;
253 336
254our @ISA = CFClient::UI::Base::; 337our @ISA = CFClient::UI::Base::;
… …
332 415
333use strict; 416use strict;
334 417
335use CFClient::OpenGL; 418use CFClient::OpenGL;
336 419
337our @ISA = CFClient::UI::VBox::; 420our @ISA = CFClient::UI::Frame::;
338 421
339sub new { 422sub new {
340 my $class = shift; 423 my $class = shift;
341 424
342 my $self = $class->SUPER::new ( 425 my $self = $class->SUPER::new (
426 bg => [0, 0, 0, 0.8],
343 @_, 427 @_,
344 children => [map 428 );
429
430 $self->add ($self->{vbox} = new CFClient::UI::VBox);
431
432 $self->{label} = [
433 map
345 CFClient::UI::Label->new ( 434 CFClient::UI::Label->new (
346 can_hover => 1, 435 can_hover => 1,
347 can_events => 1, 436 can_events => 1,
437 tooltip_width => 0.33,
348 fontsize => $_, 438 fontsize => $_,
349 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 439 ), (0.8) x 16
440 ];
441
442 $self->{entry} = new CFClient::UI::Entry
443 on_changed => sub {
444 $self->update_labels;
350 ], 445 },
446 on_key_down => sub {
447 my ($entry, $ev) = @_;
448
449 my $self = $entry->{parent}{parent};
450
451 if ($ev->{sym} == 13) {
452 if (exists $self->{select}) {
453 $self->{last_command} = $self->{select};
454 $::CONN->user_send ($self->{select});
455 $self->hide;
456 }
457 } elsif ($ev->{sym} == 27) {
458 $self->hide;
459 return;
460 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
461 ++$self->{select_offset}
462 if $self->{select_offset} < $#{ $self->{last_match} || [] };
463 $self->update_labels;
464 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
465 --$self->{select_offset}
466 if $self->{select_offset};
467 $self->update_labels;
468 } else {
469 return 0;
470 }
471
472 1
473 }
474 ;
475
476 $self->{vbox}->add (
477 $self->{entry},
478 @{$self->{label}},
351 ); 479 );
352 480
353 $self 481 $self
482}
483
484sub set_prefix {
485 my ($self, $prefix) = @_;
486
487 $self->{entry}->set_text ($prefix);
488 $self->show;
354} 489}
355 490
356sub size_allocate { 491sub size_allocate {
357 my ($self, $w, $h) = @_; 492 my ($self, $w, $h) = @_;
358 493
359 $self->SUPER::size_allocate ($w, $h); 494 $self->SUPER::size_allocate ($w, $h);
360 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 495 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
361} 496}
362 497
363sub update_labels { 498sub show {
364 my ($self) = @_; 499 my ($self) = @_;
365 500
366 my $command = $self->{command}; 501 $self->SUPER::show;
367 my $search_abbrev = qr/^\Q$self->{search}/; 502 $self->{entry}->focus_in;
368 my $search_full = qr/\Q$self->{search}/; 503}
369 504
370 my @found; 505sub hide {
506 my ($self) = @_;
371 507
372 for (@$command) { 508 $self->SUPER::hide;
373 if ($_->[0] =~ $search_abbrev) {
374 push @found, [$_->[0], $_];
375 } elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
376 push @found, [$_->[1], $_];
377 }
378 }
379
380 @found = sort { $a->[0] cmp $b->[0] } @found;
381
382 $self->{children}[0]->set_text ("$self->{search}_");
383
384 for (0..5) {
385 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
386 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
387 }
388
389 $self->{select} = $found[0][1]
390 if @found;
391
392 if (@found > 6) {
393 $self->{children}[6]->set_text ("..."); 509 $self->{entry}->set_text ("");
394 }
395
396 $self->check_size;
397} 510}
398 511
399sub key_down { 512sub key_down {
400 my ($self, $ev) = @_; 513 my ($self, $ev) = @_;
401 514
402 if ($ev->{sym} == 8) { 515 $self->{entry}->key_down ($ev)
403 substr $self->{search}, -1, 1, ""; 516}
404 $self->update_labels; 517
405 } elsif ($ev->{sym} == 13) { 518sub update_labels {
406 if (exists $self->{select}) { 519 my ($self) = @_;
407 $self->emit (execute => $self->{select}); 520
408 $self->emit ("close"); 521 my $text = $self->{entry}->get_text;
522
523 length $text
524 or return $self->hide;
525
526 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
527
528 if ($text ne $self->{last_search}) {
529 my @match;
530
531 if ($text =~ /^(.*?)\s+$/) {
532 @match = [$cmd, "(appended whitespace suppresses completion)"];
533 } else {
534 my $regexp = do {
535 my ($beg, @chr) = split //, lc $cmd;
536
537 # the following regex is used to match our "completion entry"
538 # to an actual command - the parentheses match kind of "overhead"
539 # - the more characters the parentheses match, the less attractive
540 # is the match.
541 my $regexp = "^\Q$beg\E"
542 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
543 qr<$regexp>
544 };
545
546 my @penalty;
547
548 for (keys %{$self->{command}}) {
549 if (@penalty = $_ =~ $regexp) {
550 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
551 }
552 }
553
554 @match = map $self->{command}{$_->[0]},
555 sort {
556 $a->[1] <=> $b->[1]
557 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
558 or (length $b->[0]) <=> (length $a->[0])
559 } @match;
409 } 560 }
410 } elsif ($ev->{sym} == 27) { 561
411 $self->emit ("close"); 562 $self->{last_search} = $text;
412 return; 563 $self->{last_match} = \@match;
413 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 564
414 $self->{search} .= chr $ev->{unicode}; 565 $self->{select_offset} = 0;
566 }
567
568 my @labels = @{ $self->{label} };
569 my @matches = @{ $self->{last_match} || [] };
570
571 if ($self->{select_offset}) {
572 splice @matches, 0, $self->{select_offset}, ();
573
574 my $label = shift @labels;
575 $label->set_text ("...");
576 $label->set_tooltip ("Use Cursor-Up to view previous matches");
577 }
578
579 for my $label (@labels) {
580 $label->{fg} = [1, 1, 1, 1];
581 $label->{bg} = [0, 0, 0, 0];
582 }
583
584 if (@matches) {
585 $self->{select} = "$matches[0][0]$arg";
586
587 $labels[0]->{fg} = [0, 0, 0, 1];
588 $labels[0]->{bg} = [1, 1, 1, 0.8];
589 } else {
590 $self->{select} = "$cmd$arg";
591 }
592
593 for my $match (@matches) {
594 my $label = shift @labels;
595
596 if (@labels) {
597 $label->set_text ("$match->[0]$arg");
598 $label->set_tooltip ($match->[1]);
599 } else {
600 $label->set_text ("...");
601 $label->set_tooltip ("Use Cursor-Down to view more matches");
602 last;
603 }
604 }
605
606 for my $label (@labels) {
607 $label->set_text ("");
608 $label->set_tooltip ("");
609 }
610
415 $self->update_labels; 611 $self->update;
416 } 612 ###
613}
417 614
418 length $self->{search} 615sub _draw {
419 or $self->emit ("close"); 616 my ($self) = @_;
617
618 # hack
619 local $CFClient::UI::FOCUS = $self->{entry};
620
621 $self->SUPER::_draw;
420} 622}
421 623
4221 6241

Diff Legend

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