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.19 by root, Tue Apr 25 13:51:48 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC

… …
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11 11
12sub new { 12sub new {
13 my $class = shift; 13 my $class = shift;
14 14
15 $class->SUPER::new ( 15 my $self = $class->SUPER::new (
16 z => -1, 16 z => -1,
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ) 20 );
21}
22 21
23sub DESTROY { 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 ;
34
35 $self
36}
37
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 {
24 my $self = shift; 51 my ($self) = @_;
25 52
26 glDeleteList $self->{list}; 53 %{$self->{completer}{command}} = ();
27
28 $self->SUPER::DESTROY;
29} 54}
30 55
31sub button_down { 56sub button_down {
32 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
33 58
34 $self->focus_in; 59 $self->focus_in;
35 60
36 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) {
37 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 74 my ($ox, $oy) = ($ev->{x}, $ev->{y});
38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 75 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39 76
40 $self->{motion} = sub { 77 $self->{motion} = sub {
41 my ($ev, $x, $y) = @_; 78 my ($ev, $x, $y) = @_;
… …
46 $::CFG->{map_shift_y} = $bh + $y - $oy; 83 $::CFG->{map_shift_y} = $bh + $y - $oy;
47 84
48 $self->update; 85 $self->update;
49 }; 86 };
50 } 87 }
88
89 1
51} 90}
52 91
53sub button_up { 92sub button_up {
54 my ($self, $ev, $x, $y) = @_; 93 my ($self, $ev, $x, $y) = @_;
55 94
56 delete $self->{motion}; 95 delete $self->{motion};
96
97 1
57} 98}
58 99
59sub mouse_motion { 100sub mouse_motion {
60 my ($self, $ev, $x, $y) = @_; 101 my ($self, $ev, $x, $y) = @_;
61 102
103 if ($self->{motion}) {
62 $self->{motion}->($ev, $x, $y) if $self->{motion}; 104 $self->{motion}->($ev, $x, $y);
105 } else {
106 return 0;
107 }
108
109 1
63} 110}
64 111
65sub size_request { 112sub size_request {
66 ( 113 (
67 1 + 32 * int $::WIDTH / 32, 114 1 + 32 * int $::WIDTH / 32,
… …
74 121
75 $self->{need_update} = 1; 122 $self->{need_update} = 1;
76 $self->SUPER::update; 123 $self->SUPER::update;
77} 124}
78 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
79sub draw { 226sub draw {
80 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;
81 234
82 if (delete $self->{need_update}) { 235 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 236 glNewList $self->{list};
84 237
85 if ($::MAP) { 238 if ($::MAP) {
… …
95 glTranslate $sx0 - 32, $sy0 - 32, 0; 248 glTranslate $sx0 - 32, $sy0 - 32, 0;
96 249
97 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);
98 251
99 if ($::CFG->{fow_enable}) { 252 if ($::CFG->{fow_enable}) {
100 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
101 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 254 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
102 glConvolutionFilter2D ( 255 glConvolutionFilter2D (
103 GL_CONVOLUTION_2D, 256 GL_CONVOLUTION_2D,
104 GL_ALPHA, 257 GL_ALPHA,
105 3, 3, 258 3, 3,
… …
110 0.05, 0.13, 0.05, 263 0.05, 0.13, 0.05,
111 ); 264 );
112 glEnable GL_CONVOLUTION_2D; 265 glEnable GL_CONVOLUTION_2D;
113 } 266 }
114 267
268 $self->{fow_texture_name} ||= glGenTexture;
269 # try to re-use the texture name: TODO improve texture class instead
270
115 $self->{fow_texture} = new CFClient::Texture 271 $self->{fow_texture} = new CFClient::Texture
116 w => $w, 272 w => $w,
117 h => $h, 273 h => $h,
118 data => $data, 274 data => $data,
275 name => $self->{fow_texture_name},
119 internalformat => GL_ALPHA, 276 internalformat => GL_ALPHA,
120 format => GL_ALPHA; 277 format => GL_ALPHA;
121 278
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 279 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
123 280
124 glEnable GL_BLEND;
125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126 glEnable GL_TEXTURE_2D; 281 glEnable GL_TEXTURE_2D;
127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128 283
129 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 284 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 285 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
131 286
132 glDisable GL_TEXTURE_2D; 287 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND;
134 } 288 }
135 289
136 glPopMatrix; 290 glPopMatrix;
137 } 291 }
138 292
… …
141 295
142 glPushMatrix; 296 glPushMatrix;
143 glCallList $self->{list}; 297 glCallList $self->{list};
144 glPopMatrix; 298 glPopMatrix;
145 299
146 if ($CFClient::UI::FOCUS != $self) { 300 # TNT2 emulates logops in software (or worse :)
147 glColor 64/255, 64/255, 64/255; 301 if ($focused) {
148 glLogicOp GL_AND; 302 (delete $self->{out_of_focus})->destroy
149 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;
150 glBegin GL_QUADS; 308 glBegin GL_QUADS;
151 glVertex 0, 0; 309 glVertex 0, 0;
152 glVertex 0, $::HEIGHT; 310 glVertex 0, $::HEIGHT;
153 glVertex $::WIDTH, $::HEIGHT; 311 glVertex $::WIDTH, $::HEIGHT;
154 glVertex $::WIDTH, 0; 312 glVertex $::WIDTH, 0;
155 glEnd; 313 glEnd;
156 glDisable GL_COLOR_LOGIC_OP; 314 glDisable GL_BLEND;
157 }
158}
159 315
160my %DIR = ( 316# $self->{out_of_focus} ||= do {
161 CFClient::SDLK_KP8, [1, "north"], 317# my $label = new CFClient::UI::Label
162 CFClient::SDLK_KP9, [2, "northeast"], 318# x => 0,
163 CFClient::SDLK_KP6, [3, "east"], 319# y => 0,
164 CFClient::SDLK_KP3, [4, "southeast"], 320# z => 1,
165 CFClient::SDLK_KP2, [5, "south"], 321# ellipsise => 0,
166 CFClient::SDLK_KP1, [6, "southwest"], 322# text => "map out of focus (click map to play)";
167 CFClient::SDLK_KP4, [7, "west"], 323#
168 CFClient::SDLK_KP7, [8, "northwest"], 324# $label->show;
169 325# $label->update;
170 CFClient::SDLK_UP, [1, "north"], 326#
171 CFClient::SDLK_RIGHT, [3, "east"], 327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
172 CFClient::SDLK_DOWN, [5, "south"], 328# $label->move_abs (
173 CFClient::SDLK_LEFT, [7, "west"], 329# ($::WIDTH - $label->{w}) * 0.5,
174); 330# ($::HEIGHT - $label->{h}) * 0.5,
175 331# );
176sub key_down { 332# });
177 my ($self, $ev) = @_; 333#
178 334# $label
179 my $mod = $ev->{mod};
180 my $sym = $ev->{sym};
181
182 if ($sym == CFClient::SDLK_KP5) {
183 $::CONN->user_send ("stay fire");
184 } elsif ($sym == ord ",") {
185 $::CONN->user_send ("take");
186 } elsif ($sym == ord "a") {
187 $::CONN->user_send ("apply");
188 } elsif ($sym == ord "'") {
189 $self->emit ('activate_console');
190 } elsif ($sym == ord "/") {
191 $self->emit (activate_console => '/');
192 } elsif (exists $DIR{$sym}) {
193 if ($mod & CFClient::KMOD_SHIFT) {
194 $self->{shft}++;
195 $::CONN->user_send ("fire $DIR{$sym}[0]");
196 } elsif ($mod & CFClient::KMOD_CTRL) {
197 $self->{ctrl}++;
198 $::CONN->user_send ("run $DIR{$sym}[0]");
199 } else {
200 $::CONN->user_send ("$DIR{$sym}[1]");
201 } 335# };
202 } elsif ($ev->{unicode}) {
203 $self->{command_widget} ||=
204 new CFClient::MapWidget::Command::
205 command => $self->{command},
206 can_focus => 1,
207 connect_execute => sub {
208 # todo: support callback instead of user_send
209 $::CONN->user_send ($_[1][1]);
210 },
211 connect_close => sub {
212 (delete $self->{command_widget})->hide;
213 $self->focus_in;
214 },
215 ;
216 $self->{command_widget}->key_down ($ev);
217 return unless $self->{command_widget};
218 $self->{command_widget}->show;
219 $self->{command_widget}->focus_in;
220 } 336 }
221} 337}
222 338
223sub key_up { 339sub DESTROY {
224 my ($self, $ev) = @_; 340 my $self = shift;
225 341
226 my $mod = $ev->{mod}; 342 glDeleteList $self->{list};
227 my $sym = $ev->{sym};
228 343
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 344 $self->SUPER::DESTROY;
230 $::CONN->user_send ("fire_stop");
231 }
232 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
233 $::CONN->user_send ("run_stop");
234 }
235}
236
237sub add_command {
238 my ($self, $command, $tooltip, $widget, $cb) = @_;
239
240 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
241
242 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
243} 345}
244 346
245package CFClient::MapWidget::MapMap; 347package CFClient::MapWidget::MapMap;
246 348
247our @ISA = CFClient::UI::Base::; 349our @ISA = CFClient::UI::Base::;
… …
325 427
326use strict; 428use strict;
327 429
328use CFClient::OpenGL; 430use CFClient::OpenGL;
329 431
330our @ISA = CFClient::UI::VBox::; 432our @ISA = CFClient::UI::Frame::;
331 433
332sub new { 434sub new {
333 my $class = shift; 435 my $class = shift;
334 436
335 my $self = $class->SUPER::new ( 437 my $self = $class->SUPER::new (
438 bg => [0, 0, 0, 0.8],
336 @_, 439 @_,
337 children => [map 440 );
441
442 $self->add ($self->{vbox} = new CFClient::UI::VBox);
443
444 $self->{label} = [
445 map
338 CFClient::UI::Label->new ( 446 CFClient::UI::Label->new (
339 can_hover => 1, 447 can_hover => 1,
340 can_events => 1, 448 can_events => 1,
449 tooltip_width => 0.33,
341 fontsize => $_, 450 fontsize => $_,
342 ), 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;
343 ], 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}},
344 ); 491 );
345 492
346 $self 493 $self
494}
495
496sub set_prefix {
497 my ($self, $prefix) = @_;
498
499 $self->{entry}->set_text ($prefix);
500 $self->show;
347} 501}
348 502
349sub size_allocate { 503sub size_allocate {
350 my ($self, $w, $h) = @_; 504 my ($self, $w, $h) = @_;
351 505
352 $self->SUPER::size_allocate ($w, $h); 506 $self->SUPER::size_allocate ($w, $h);
353 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 507 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
354} 508}
355 509
356sub update_labels { 510sub show {
357 my ($self) = @_; 511 my ($self) = @_;
358 512
359 my $command = $self->{command}; 513 $self->SUPER::show;
360 my $search_abbrev = qr/^\Q$self->{search}/; 514 $self->{entry}->focus_in;
361 my $search_full = qr/\Q$self->{search}/; 515}
362 516
363 my @found; 517sub hide {
518 my ($self) = @_;
364 519
365 for (@$command) { 520 $self->SUPER::hide;
366 if ($_->[0] =~ $search_abbrev) {
367 push @found, [$_->[0], $_];
368 } elsif ($_->[1] =~ $search_full) {
369 push @found, [$_->[1], $_];
370 }
371 }
372
373 @found = sort { $a->[0] cmp $b->[0] } @found;
374
375 $self->{children}[0]->set_text ("$self->{search}_");
376
377 for (0..5) {
378 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
379 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
380 }
381
382 $self->{select} = $found[0][1]
383 if @found;
384
385 if (@found > 6) {
386 $self->{children}[6]->set_text ("..."); 521 $self->{entry}->set_text ("");
387 }
388
389 $self->check_size;
390} 522}
391 523
392sub key_down { 524sub key_down {
393 my ($self, $ev) = @_; 525 my ($self, $ev) = @_;
394 526
395 if ($ev->{sym} == 8) { 527 $self->{entry}->key_down ($ev)
396 substr $self->{search}, -1, 1, ""; 528}
397 $self->update_labels; 529
398 } elsif ($ev->{sym} == 13) { 530sub update_labels {
399 if (exists $self->{select}) { 531 my ($self) = @_;
400 $self->emit (execute => $self->{select}); 532
401 $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;
402 } 572 }
403 } elsif ($ev->{sym} == 27) { 573
404 $self->emit ("close"); 574 $self->{last_search} = $text;
405 return; 575 $self->{last_match} = \@match;
406 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 576
407 $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
408 $self->update_labels; 623 $self->update;
409 } 624 ###
625}
410 626
411 length $self->{search} 627sub _draw {
412 or $self->emit ("close"); 628 my ($self) = @_;
629
630 # hack
631 local $CFClient::UI::FOCUS = $self->{entry};
632
633 $self->SUPER::_draw;
413} 634}
414 635
4151 6361

Diff Legend

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