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

Diff Legend

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