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.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines