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.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,
… …
76 128
77 $self->{need_update} = 1; 129 $self->{need_update} = 1;
78 $self->SUPER::update; 130 $self->SUPER::update;
79} 131}
80 132
133my %DIR = (
134 CFClient::SDLK_KP8, [1, "north"],
135 CFClient::SDLK_KP9, [2, "northeast"],
136 CFClient::SDLK_KP6, [3, "east"],
137 CFClient::SDLK_KP3, [4, "southeast"],
138 CFClient::SDLK_KP2, [5, "south"],
139 CFClient::SDLK_KP1, [6, "southwest"],
140 CFClient::SDLK_KP4, [7, "west"],
141 CFClient::SDLK_KP7, [8, "northwest"],
142
143 CFClient::SDLK_UP, [1, "north"],
144 CFClient::SDLK_RIGHT, [3, "east"],
145 CFClient::SDLK_DOWN, [5, "south"],
146 CFClient::SDLK_LEFT, [7, "west"],
147);
148
149sub key_down {
150 my ($self, $ev) = @_;
151
152 return 0 unless $::CONN;
153
154 my $mod = $ev->{mod};
155 my $sym = $ev->{sym};
156 my $uni = $ev->{unicode};
157
158 if ($sym == CFClient::SDLK_KP5) {
159 $::CONN->user_send ("stay fire");
160 } elsif ($uni == ord ",") {
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};
167 } elsif ($uni == ord "\t") {
168 $::INV_WINDOW->toggle_visibility;
169 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
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;
176 } elsif ($uni == ord "'") {
177 $self->{completer}->set_prefix ("");
178 $self->{completer}->show;
179 } elsif (exists $DIR{$sym}) {
180 if ($mod & CFClient::KMOD_SHIFT) {
181 $self->{shft}++;
182 if ($DIR{$sym}[0] != $self->{fire_dir}) {
183 $::CONN->user_send ("fire $DIR{$sym}[0]");
184 }
185 $self->{fire_dir} = $DIR{$sym}[0];
186 } elsif ($mod & CFClient::KMOD_CTRL) {
187 $self->{ctrl}++;
188 $::CONN->user_send ("run $DIR{$sym}[0]");
189 } else {
190 $::CONN->user_send ("$DIR{$sym}[1]");
191 }
192 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
193 $::BIND_EDITOR->set_binding (undef, undef, [],
194 sub {
195 my ($mod, $sym, $cmds) = @_;
196 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
197 });
198 $::BIND_EDITOR->start;
199 $::BIND_EDITOR->show;
200 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
201 $::BIND_EDITOR->stop;
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')) {
207 $self->{completer}->key_down ($ev);
208 $self->{completer}->show;
209 } else {
210 return 0;
211 }
212
213 1
214}
215
216sub key_up {
217 my ($self, $ev) = @_;
218
219 my $res = 0;
220 my $mod = $ev->{mod};
221 my $sym = $ev->{sym};
222
223 if ($::CFG->{shift_fire_stop}) {
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
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 }
239 }
240
241 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
242 $::CONN->user_send ("run_stop");
243 $res = 1;
244 }
245
246 $res
247}
248
81sub draw { 249sub draw {
82 my ($self) = @_; 250 my ($self) = @_;
83 251
252 return unless $::MAP;
253
254 my $focused = $CFClient::UI::FOCUS == $self
255 || $CFClient::UI::FOCUS == $self->{completer}{entry};
256
84 return 257 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 258 unless $focused || !$::FAST;
86 259
87 if (delete $self->{need_update}) { 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
88 glNewList $self->{list}; 299 glNewList $self->{list};
89 300
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; 301 glPushMatrix;
302 glTranslate $sx0, $sy0;
98 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 303 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99 304
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 305 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
101 306
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 307 if (my $tex = $self->{fow_texture}) {
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; 308 glEnable GL_TEXTURE_2D;
134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135 310
311 glScale 32, 32;
136 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 312 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 313 $self->{fow_texture}->draw_quad_alpha (0, 0);
138 314
139 glDisable GL_TEXTURE_2D; 315 glDisable GL_TEXTURE_2D;
140 } 316 }
141 317
142 glPopMatrix; 318 glPopMatrix;
143 }
144 319
145 glEndList; 320 glEndList;
146 } 321 }
147 322
148 glPushMatrix; 323 glPushMatrix;
149 glCallList $self->{list}; 324 glCallList $self->{list};
150 glPopMatrix; 325 glPopMatrix;
151 326
152 # TNT2 emulates logops in software (or worse :) 327 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS == $self) { 328 unless ($focused) {
154 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus};
156 } else {
157 glColor 0.4, 0.2, 0.2, 0.6; 329 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND; 330 glEnable GL_BLEND;
159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 331 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
160 glBegin GL_QUADS; 332 glBegin GL_QUADS;
161 glVertex 0, 0; 333 glVertex 0, 0;
162 glVertex 0, $::HEIGHT; 334 glVertex 0, $::HEIGHT;
163 glVertex $::WIDTH, $::HEIGHT; 335 glVertex $::WIDTH, $::HEIGHT;
164 glVertex $::WIDTH, 0; 336 glVertex $::WIDTH, 0;
165 glEnd; 337 glEnd;
166 glDisable GL_BLEND; 338 glDisable GL_BLEND;
167
168 $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label
170 x => 0,
171 y => 0,
172 z => 1,
173 ellipsise => 0,
174 text => "map out of focus (click map to play)";
175
176 $label->show;
177 $label->update;
178
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move (
181 ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5,
183 );
184 });
185
186 $label
187 };
188 } 339 }
189} 340}
190 341
191my %DIR = ( 342sub 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) = @_; 343 my $self = shift;
292 344
293 %{$self->{command}} = (); 345 glDeleteList $self->{list};
346
347 $self->SUPER::DESTROY;
294} 348}
295 349
296package CFClient::MapWidget::MapMap; 350package CFClient::MapWidget::MapMap;
297 351
298our @ISA = CFClient::UI::Base::; 352our @ISA = CFClient::UI::Base::;
… …
399 fontsize => $_, 453 fontsize => $_,
400 ), (0.8) x 16 454 ), (0.8) x 16
401 ]; 455 ];
402 456
403 $self->{entry} = new CFClient::UI::Entry 457 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub { 458 on_changed => sub {
405 $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
406 }; 524 }
525 ;
407 526
408 $self->{vbox}->add ( 527 $self->{vbox}->add (
409 $self->{entry}, 528 $self->{entry},
410 @{$self->{label}}, 529 @{$self->{label}},
411 ); 530 );
412 531
413 $self 532 $self
414} 533}
415 534
535sub set_prefix {
536 my ($self, $prefix) = @_;
537
538 $self->{entry}->set_text ($prefix);
539 $self->show;
540}
541
416sub size_allocate { 542sub size_allocate {
417 my ($self, $w, $h) = @_; 543 my ($self, $w, $h) = @_;
418 544
419 $self->SUPER::size_allocate ($w, $h); 545 $self->SUPER::size_allocate ($w, $h);
420 $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 ("");
421} 561}
422 562
423sub key_down { 563sub key_down {
424 my ($self, $ev) = @_; 564 my ($self, $ev) = @_;
425 565
426 if ($ev->{sym} == 13) {
427 if (exists $self->{select}) {
428 $self->emit (execute => $self->{select});
429 $self->emit ("close");
430 }
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); 566 $self->{entry}->key_down ($ev)
446 }
447} 567}
448 568
449sub update_labels { 569sub update_labels {
450 my ($self) = @_; 570 my ($self) = @_;
451 571
452 my $text = $self->{entry}->get_text; 572 my $text = $self->{entry}->get_text;
453 573
454 length $text 574 length $text
455 or return $self->emit ("close"); 575 or return $self->hide;
456 576
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 577 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458 578
459 if ($cmd ne $self->{last_search}) { 579 if ($text 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; 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
473 my @penalty; 597 my @penalty;
474 598
475 for (keys %{$self->{command}}) { 599 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) { 600 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 601 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
602 }
478 } 603 }
479 }
480 604
481 @match = map $self->{command}{$_->[0]}, 605 @match = map $self->{command}{$_->[0]},
482 sort { 606 sort {
483 $a->[1] <=> $b->[1] 607 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 608 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0]) 609 or (length $b->[0]) <=> (length $a->[0])
486 } @match; 610 } @match;
611 }
487 612
488 $self->{last_search} = $cmd; 613 $self->{last_search} = $text;
489 $self->{last_match} = \@match; 614 $self->{last_match} = \@match;
490 615
491 $self->{select_offset} = 0; 616 $self->{select_offset} = 0;
492 } 617 }
493 618

Diff Legend

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