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

Diff Legend

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