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.4 by root, Wed Apr 19 23:37:49 2006 UTC vs.
Revision 1.47 by root, Fri Jun 2 22:13:47 2006 UTC

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

Diff Legend

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