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

Diff Legend

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