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

Diff Legend

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