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

Diff Legend

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