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.51 by root, Thu Jun 8 01:51:32 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
149 return 0 unless $::CONN;
150
183 my $mod = $ev->{mod}; 151 my $mod = $ev->{mod};
184 my $sym = $ev->{sym}; 152 my $sym = $ev->{sym};
153 my $uni = $ev->{unicode};
185 154
186 if ($sym == CFClient::SDLK_KP5) { 155 if ($sym == CFClient::SDLK_KP5) {
187 $::CONN->user_send ("stay fire"); 156 $::CONN->user_send ("stay fire");
188 } elsif ($sym == ord ",") { 157 } elsif ($uni == ord ",") {
189 $::CONN->user_send ("take"); 158 $::CONN->user_send ("take");
190 } elsif ($sym == ord "a") { 159 } elsif ($uni == ord " ") {
191 $::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;
192 } elsif ($sym == ord "'") { 173 } elsif ($uni == ord "'") {
193 $self->emit ('activate_console'); 174 $self->{completer}->set_prefix ("");
194 } elsif ($sym == ord "/") { 175 $self->{completer}->show;
195 $self->emit (activate_console => '/');
196 } elsif (exists $DIR{$sym}) { 176 } elsif (exists $DIR{$sym}) {
197 if ($mod & CFClient::KMOD_SHIFT) { 177 if ($mod & CFClient::KMOD_SHIFT) {
198 $self->{shft}++; 178 $self->{shft}++;
199 $::CONN->user_send ("fire $DIR{$sym}[0]"); 179 $::CONN->user_send ("fire $DIR{$sym}[0]");
200 } elsif ($mod & CFClient::KMOD_CTRL) { 180 } elsif ($mod & CFClient::KMOD_CTRL) {
201 $self->{ctrl}++; 181 $self->{ctrl}++;
202 $::CONN->user_send ("run $DIR{$sym}[0]"); 182 $::CONN->user_send ("run $DIR{$sym}[0]");
203 } else { 183 } else {
204 $::CONN->user_send ("$DIR{$sym}[1]"); 184 $::CONN->user_send ("$DIR{$sym}[1]");
205 } 185 }
206 } elsif ($ev->{unicode}) { 186 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
207 $self->{command_widget} ||= 187 $::BIND_EDITOR->set_binding (undef, undef, [],
208 new CFClient::MapWidget::Command:: 188 sub {
209 command => $self->{command}, 189 my ($mod, $sym, $cmds) = @_;
210 can_focus => 1, 190 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
211 connect_execute => sub {
212 # todo: support callback instead of user_send
213 $::CONN->user_send ($_[1][1]);
214 }, 191 });
215 connect_close => sub { 192 $::BIND_EDITOR->start;
216 (delete $self->{command_widget})->hide; 193 $::BIND_EDITOR->show;
217 $self->focus_in; 194 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
218 }, 195 $::BIND_EDITOR->stop;
219 ; 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')) {
220 $self->{command_widget}->key_down ($ev); 201 $self->{completer}->key_down ($ev);
221 return unless $self->{command_widget};
222 $self->{command_widget}->show; 202 $self->{completer}->show;
223 $self->{command_widget}->focus_in; 203 } else {
204 return 0;
205 }
206
224 } 207 1
225} 208}
226 209
227sub key_up { 210sub key_up {
228 my ($self, $ev) = @_; 211 my ($self, $ev) = @_;
229 212
213 my $res = 0;
230 my $mod = $ev->{mod}; 214 my $mod = $ev->{mod};
231 my $sym = $ev->{sym}; 215 my $sym = $ev->{sym};
232 216
233 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
234 $::CONN->user_send ("fire_stop"); 218 $::CONN->user_send ("fire_stop");
219 $res = 1;
235 } 220 }
221
236 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
237 $::CONN->user_send ("run_stop"); 223 $::CONN->user_send ("run_stop");
224 $res = 1;
238 } 225 }
239}
240 226
241sub add_command { 227 $res
242 my ($self, $command, $tooltip, $widget, $cb) = @_; 228}
243 229
244 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 230sub draw {
231 my ($self) = @_;
245 232
246 $self->{command} = [ 233 my $focused = $CFClient::UI::FOCUS == $self
247 [$abbrev, $command, $tooltip, $widget, $cb], 234 || $CFClient::UI::FOCUS == $self->{completer}{entry};
248 grep $_->[1] ne $command, @{ $self->{command} }, 235
249 ]; 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;
250} 346}
251 347
252package CFClient::MapWidget::MapMap; 348package CFClient::MapWidget::MapMap;
253 349
254our @ISA = CFClient::UI::Base::; 350our @ISA = CFClient::UI::Base::;
… …
332 428
333use strict; 429use strict;
334 430
335use CFClient::OpenGL; 431use CFClient::OpenGL;
336 432
337our @ISA = CFClient::UI::VBox::; 433our @ISA = CFClient::UI::Frame::;
338 434
339sub new { 435sub new {
340 my $class = shift; 436 my $class = shift;
341 437
342 my $self = $class->SUPER::new ( 438 my $self = $class->SUPER::new (
439 bg => [0, 0, 0, 0.8],
343 @_, 440 @_,
344 children => [map 441 );
442
443 $self->add ($self->{vbox} = new CFClient::UI::VBox);
444
445 $self->{label} = [
446 map
345 CFClient::UI::Label->new ( 447 CFClient::UI::Label->new (
346 can_hover => 1, 448 can_hover => 1,
347 can_events => 1, 449 can_events => 1,
450 tooltip_width => 0.33,
348 fontsize => $_, 451 fontsize => $_,
349 ), 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;
350 ], 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 $self->hide;
469 }
470 } elsif ($ev->{sym} == 27) {
471 $self->hide;
472 return;
473 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
474 ++$self->{select_offset}
475 if $self->{select_offset} < $#{ $self->{last_match} || [] };
476 $self->update_labels;
477 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
478 --$self->{select_offset}
479 if $self->{select_offset};
480 $self->update_labels;
481 } else {
482 return 0;
483 }
484
485 1
486 }
487 ;
488
489 $self->{vbox}->add (
490 $self->{entry},
491 @{$self->{label}},
351 ); 492 );
352 493
353 $self 494 $self
495}
496
497sub set_prefix {
498 my ($self, $prefix) = @_;
499
500 $self->{entry}->set_text ($prefix);
501 $self->show;
354} 502}
355 503
356sub size_allocate { 504sub size_allocate {
357 my ($self, $w, $h) = @_; 505 my ($self, $w, $h) = @_;
358 506
359 $self->SUPER::size_allocate ($w, $h); 507 $self->SUPER::size_allocate ($w, $h);
360 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 508 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
361} 509}
362 510
363sub update_labels { 511sub show {
364 my ($self) = @_; 512 my ($self) = @_;
365 513
366 my $command = $self->{command}; 514 $self->SUPER::show;
367 my $search_abbrev = qr/^\Q$self->{search}/; 515 $self->{entry}->focus_in;
368 my $search_full = qr/\Q$self->{search}/; 516}
369 517
370 my @found; 518sub hide {
519 my ($self) = @_;
371 520
372 for (@$command) { 521 $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 ("..."); 522 $self->{entry}->set_text ("");
394 }
395
396 $self->check_size;
397} 523}
398 524
399sub key_down { 525sub key_down {
400 my ($self, $ev) = @_; 526 my ($self, $ev) = @_;
401 527
402 if ($ev->{sym} == 8) { 528 $self->{entry}->key_down ($ev)
403 substr $self->{search}, -1, 1, ""; 529}
404 $self->update_labels; 530
405 } elsif ($ev->{sym} == 13) { 531sub update_labels {
406 if (exists $self->{select}) { 532 my ($self) = @_;
407 $self->emit (execute => $self->{select}); 533
408 $self->emit ("close"); 534 my $text = $self->{entry}->get_text;
535
536 length $text
537 or return $self->hide;
538
539 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
540
541 if ($text ne $self->{last_search}) {
542 my @match;
543
544 if ($text =~ /^(.*?)\s+$/) {
545 @match = [$cmd, "(appended whitespace suppresses completion)"];
546 } else {
547 my $regexp = do {
548 my ($beg, @chr) = split //, lc $cmd;
549
550 # the following regex is used to match our "completion entry"
551 # to an actual command - the parentheses match kind of "overhead"
552 # - the more characters the parentheses match, the less attractive
553 # is the match.
554 my $regexp = "^\Q$beg\E"
555 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
556 qr<$regexp>
557 };
558
559 my @penalty;
560
561 for (keys %{$self->{command}}) {
562 if (@penalty = $_ =~ $regexp) {
563 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
564 }
565 }
566
567 @match = map $self->{command}{$_->[0]},
568 sort {
569 $a->[1] <=> $b->[1]
570 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
571 or (length $b->[0]) <=> (length $a->[0])
572 } @match;
409 } 573 }
410 } elsif ($ev->{sym} == 27) { 574
411 $self->emit ("close"); 575 $self->{last_search} = $text;
412 return; 576 $self->{last_match} = \@match;
413 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 577
414 $self->{search} .= chr $ev->{unicode}; 578 $self->{select_offset} = 0;
579 }
580
581 my @labels = @{ $self->{label} };
582 my @matches = @{ $self->{last_match} || [] };
583
584 if ($self->{select_offset}) {
585 splice @matches, 0, $self->{select_offset}, ();
586
587 my $label = shift @labels;
588 $label->set_text ("...");
589 $label->set_tooltip ("Use Cursor-Up to view previous matches");
590 }
591
592 for my $label (@labels) {
593 $label->{fg} = [1, 1, 1, 1];
594 $label->{bg} = [0, 0, 0, 0];
595 }
596
597 if (@matches) {
598 $self->{select} = "$matches[0][0]$arg";
599
600 $labels[0]->{fg} = [0, 0, 0, 1];
601 $labels[0]->{bg} = [1, 1, 1, 0.8];
602 } else {
603 $self->{select} = "$cmd$arg";
604 }
605
606 for my $match (@matches) {
607 my $label = shift @labels;
608
609 if (@labels) {
610 $label->set_text ("$match->[0]$arg");
611 $label->set_tooltip ($match->[1]);
612 } else {
613 $label->set_text ("...");
614 $label->set_tooltip ("Use Cursor-Down to view more matches");
615 last;
616 }
617 }
618
619 for my $label (@labels) {
620 $label->set_text ("");
621 $label->set_tooltip ("");
622 }
623
415 $self->update_labels; 624 $self->update;
416 } 625 ###
626}
417 627
418 length $self->{search} 628sub _draw {
419 or $self->emit ("close"); 629 my ($self) = @_;
630
631 # hack
632 local $CFClient::UI::FOCUS = $self->{entry};
633
634 $self->SUPER::_draw;
420} 635}
421 636
4221 6371

Diff Legend

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