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

Diff Legend

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