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.57 by elmex, Tue Jun 13 11:01:04 2006 UTC

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

Diff Legend

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