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

Diff Legend

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