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

Diff Legend

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