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.28 by root, Wed May 17 20:50:19 2006 UTC vs.
Revision 1.56 by root, Mon Jun 12 13:26:14 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->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 $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 if ($CFClient::UI::FOCUS != $self) {
152 glColor 64/255, 64/255, 64/255;
153 glLogicOp GL_AND;
154 glEnable GL_COLOR_LOGIC_OP;
155 glBegin GL_QUADS;
156 glVertex 0, 0;
157 glVertex 0, $::HEIGHT;
158 glVertex $::WIDTH, $::HEIGHT;
159 glVertex $::WIDTH, 0;
160 glEnd;
161 glDisable GL_COLOR_LOGIC_OP;
162 }
163} 135}
164 136
165my %DIR = ( 137my %DIR = (
166 CFClient::SDLK_KP8, [1, "north"], 138 CFClient::SDLK_KP8, [1, "north"],
167 CFClient::SDLK_KP9, [2, "northeast"], 139 CFClient::SDLK_KP9, [2, "northeast"],
… …
179); 151);
180 152
181sub key_down { 153sub key_down {
182 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
183 155
184 return unless $::CONN; 156 return 0 unless $::CONN;
185 157
186 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
187 my $sym = $ev->{sym}; 159 my $sym = $ev->{sym};
188 my $uni = $ev->{unicode}; 160 my $uni = $ev->{unicode};
189 161
190 if ($sym == CFClient::SDLK_KP5) { 162 if ($sym == CFClient::SDLK_KP5) {
191 $::CONN->user_send ("stay fire"); 163 $::CONN->user_send ("stay fire");
192 } elsif ($uni == ord ",") { 164 } elsif ($uni == ord ",") {
193 $::CONN->user_send ("take"); 165 $::CONN->user_send ("take");
194 } elsif ($uni == ord "\t" or $uni == ord " ") { 166 } elsif ($uni == ord " ") {
195 $::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;
196 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
197 $::CONN->user_send ("rotateshoottype +"); 174 $::CONN->user_send ("rotateshoottype +");
198 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
199 $::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;
200 } elsif ($uni == ord "'") { 180 } elsif ($uni == ord "'") {
201 $self->emit ('activate_console'); 181 $self->{completer}->set_prefix ("");
202 } elsif ($uni == ord "/") { 182 $self->{completer}->show;
203 $self->emit (activate_console => '/');
204 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
205 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
206 $self->{shft}++; 185 $self->{shft}++;
207 $::CONN->user_send ("fire $DIR{$sym}[0]"); 186 $::CONN->user_send ("fire $DIR{$sym}[0]");
208 } elsif ($mod & CFClient::KMOD_CTRL) { 187 } elsif ($mod & CFClient::KMOD_CTRL) {
209 $self->{ctrl}++; 188 $self->{ctrl}++;
210 $::CONN->user_send ("run $DIR{$sym}[0]"); 189 $::CONN->user_send ("run $DIR{$sym}[0]");
211 } else { 190 } else {
212 $::CONN->user_send ("$DIR{$sym}[1]"); 191 $::CONN->user_send ("$DIR{$sym}[1]");
213 } 192 }
214 } elsif ($ev->{unicode}) { 193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
215 $self->{command_widget} ||= 194 $::BIND_EDITOR->set_binding (undef, undef, [],
216 new CFClient::MapWidget::Command:: 195 sub {
217 command => $self->{command}, 196 my ($mod, $sym, $cmds) = @_;
218 can_focus => 1, 197 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
219 connect_execute => sub {
220 # todo: support callback instead of user_send
221 $::CONN->user_send ($_[1]);
222 }, 198 });
223 connect_close => sub { 199 $::BIND_EDITOR->start;
224 (delete $self->{command_widget})->hide; 200 $::BIND_EDITOR->show;
225 $self->focus_in; 201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
226 }, 202 $::BIND_EDITOR->stop;
227 ; 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')) {
228 $self->{command_widget}->key_down ($ev) 208 $self->{completer}->key_down ($ev);
229 unless $ev->{unicode} == 20;
230 return unless $self->{command_widget};
231 $self->{command_widget}->show; 209 $self->{completer}->show;
232 $self->{command_widget}->focus_in; 210 } else {
211 return 0;
212 }
213
233 } 214 1
234} 215}
235 216
236sub key_up { 217sub key_up {
237 my ($self, $ev) = @_; 218 my ($self, $ev) = @_;
238 219
220 my $res = 0;
239 my $mod = $ev->{mod}; 221 my $mod = $ev->{mod};
240 my $sym = $ev->{sym}; 222 my $sym = $ev->{sym};
241 223
242 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
243 $::CONN->user_send ("fire_stop"); 225 $::CONN->user_send ("fire_stop");
226 $res = 1;
244 } 227 }
228
245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
246 $::CONN->user_send ("run_stop"); 230 $::CONN->user_send ("run_stop");
231 $res = 1;
247 } 232 }
248}
249 233
250sub add_command { 234 $res
251 my ($self, $command, $tooltip, $widget, $cb) = @_;
252
253 (my $data = $command) =~ s/\\//g;
254
255 $tooltip =~ s/^\s+//;
256
257 $tooltip = "<big>$data</big>\n\n$tooltip";
258
259 $tooltip =~ s/\s+$//;
260
261 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
262} 235}
263 236
264sub 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 {
265 my ($self) = @_; 350 my $self = shift;
266 351
267 %{$self->{command}} = (); 352 glDeleteList $self->{list};
353
354 $self->SUPER::DESTROY;
268} 355}
269 356
270package CFClient::MapWidget::MapMap; 357package CFClient::MapWidget::MapMap;
271 358
272our @ISA = CFClient::UI::Base::; 359our @ISA = CFClient::UI::Base::;
… …
373 fontsize => $_, 460 fontsize => $_,
374 ), (0.8) x 16 461 ), (0.8) x 16
375 ]; 462 ];
376 463
377 $self->{entry} = new CFClient::UI::Entry 464 $self->{entry} = new CFClient::UI::Entry
378 connect_changed => sub { 465 on_changed => sub {
379 $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
380 }; 518 }
519 ;
381 520
382 $self->{vbox}->add ( 521 $self->{vbox}->add (
383 $self->{entry}, 522 $self->{entry},
384 @{$self->{label}}, 523 @{$self->{label}},
385 ); 524 );
386 525
387 $self 526 $self
388} 527}
389 528
529sub set_prefix {
530 my ($self, $prefix) = @_;
531
532 $self->{entry}->set_text ($prefix);
533 $self->show;
534}
535
390sub size_allocate { 536sub size_allocate {
391 my ($self, $w, $h) = @_; 537 my ($self, $w, $h) = @_;
392 538
393 $self->SUPER::size_allocate ($w, $h); 539 $self->SUPER::size_allocate ($w, $h);
394 $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 ("");
395} 555}
396 556
397sub key_down { 557sub key_down {
398 my ($self, $ev) = @_; 558 my ($self, $ev) = @_;
399 559
400 if ($ev->{sym} == 13) { 560 $self->{entry}->key_down ($ev)
401 if (exists $self->{select}) { 561}
402 $self->emit (execute => $self->{select}); 562
403 $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;
404 } 605 }
405 } elsif ($ev->{sym} == 27) {
406 $self->{entry}->set_text ("");
407 $self->emit ("close");
408 return;
409 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
410 ++$self->{select_offset}
411 if $self->{select_offset} < $#{ $self->{last_match} || [] };
412 $self->update_labels;
413 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
414 --$self->{select_offset}
415 if $self->{select_offset};
416 $self->update_labels;
417 } else {
418 #$self->{entry}{force_alloc} = 1;
419 $self->{entry}->key_down ($ev);
420 }
421}
422 606
423sub update_labels {
424 my ($self) = @_;
425
426 my $text = $self->{entry}->get_text;
427
428 length $text
429 or return $self->emit ("close");
430
431 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
432
433 if ($cmd ne $self->{last_search}) {
434 my $regexp = do {
435 my ($beg, @chr) = split //, lc $cmd;
436
437 # the following regex is used to match our "completion entry"
438 # to an actual command - the parentheses match kind of "overhead"
439 # - the more characters the parentheses match, the less attractive
440 # is the match.
441 my $regexp = "^\Q$beg\E"
442 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
443 qr<$regexp>
444 };
445
446 my @match;
447 my @penalty;
448
449 for (keys %{$self->{command}}) {
450 if (@penalty = $_ =~ $regexp) {
451 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
452 }
453 }
454
455 @match = map $self->{command}{$_->[0]},
456 sort {
457 $a->[1] <=> $b->[1]
458 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
459 } @match;
460
461 $self->{last_search} = $cmd; 607 $self->{last_search} = $text;
462 $self->{last_match} = \@match; 608 $self->{last_match} = \@match;
463 609
464 $self->{select_offset} = 0; 610 $self->{select_offset} = 0;
465 } 611 }
466 612

Diff Legend

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