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

Diff Legend

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